Remove unmount timeout on shutdown#195
Merged
Merged
Conversation
UnmountAllWithRetries set it's own 30s timeout, but it's covered by the overall shutdown timeout. Setting a distinct timeout for unmount makes it harder to trace exactly which timeout expired if shutdown takes too long. Instead, we should treat the whole shutdown process as a single process covered by a single timeout. Signed-off-by: Kern Walster <kern.walster@gmail.com>
There was a problem hiding this comment.
Pull request overview
Removes the per-operation unmount timeout during shim shutdown so unmounting block volumes is governed by the single, overall shutdown timeout, avoiding ambiguous “which timeout fired” behavior during slow shutdowns.
Changes:
- Removed the nested
context.WithTimeout(..., 30*time.Second)aroundunmountAllWithRetry. - Reused the shutdown callback’s
ctxfor unmount retries to align unmount timing with the global shutdown deadline.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
austinvazquez
approved these changes
May 21, 2026
dmcgowan
approved these changes
May 21, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
UnmountAllWithRetries set it's own 30s timeout, but it's covered by the overall shutdown timeout. Setting a distinct timeout for unmount makes it harder to trace exactly which timeout expired if shutdown takes too long. Instead, we should treat the whole shutdown process as a single process covered by a single timeout.